Keep the Windows-style icons in dialog OK and cancel only in Windows.

diff --git a/gui/advdlg.cc b/gui/advdlg.cc
index cf32bc580ad95445e434afa99a13ba5b266a910f..334e16c7ed8003a4ef9519fcf206660920a03449 100644 (file)
--- a/gui/advdlg.cc
+++ b/gui/advdlg.cc
@@ -39,8 +39,10 @@ AdvDlg::AdvDlg(QWidget* parent,
   ui_.synthShortNames->setChecked(synthShortNames);
   ui_.previewGmap->setChecked(previewGmap);
   ui_.debugCombo->setCurrentIndex(debugLevel+1);
+#if defined (Q_OS_WIN)
   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
+#endif // Q_OS_WIN
   connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(acceptClicked()));
   connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(rejectClicked()));
 }

diff --git a/gui/filterdlg.cc b/gui/filterdlg.cc
index b0784474ec1134188669512f3561bd5d17bfa390..2351a2ed3c84921f945ebd96d1b4aaa247d8815d 100644 (file)
--- a/gui/filterdlg.cc
+++ b/gui/filterdlg.cc
@@ -59,9 +59,10 @@ FilterDialog::FilterDialog(QWidget*parent, AllFiltersData &fd): QDialog(parent),
   connect(ui_.helpButton, SIGNAL(clicked()), this, SLOT(helpX()));
   connect(ui_.resetButton, SIGNAL(clicked()), this, SLOT(resetX()));
 
-
+#if defined (Q_OS_WIN)
   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
+#endif
 
   ui_.filterList->setCurrentRow(lastPage_);